Merge release/26.4 into trunk by wpmobilebot · Pull Request #22390 · wordpress-mobile/WordPress-Android

wpmobilebot · 2025-12-03T20:46:07Z

Merging release/26.4 into trunk.

Via intermediate branch merge/release-26.4-into-trunk, to help fix conflicts if any:

                            release/26.4  ----o-- - - -
                                               \
           merge/release-26.4-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

dangermattic · 2025-12-03T20:47:49Z

	1 Message
📖	This PR has the `Releases` label: some checks will be skipped.

Generated by 🚫 Danger

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

        context.startActivity(intent);
    }

+    public static void viewReaderDiscoverInNewStack(Context context) {


wpmobilebot · 2025-12-03T21:08:53Z

📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr22390-5f80cc5
	Commit	`5f80cc5`
	Direct Download	`wordpress-prototype-build-pr22390-5f80cc5.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2025-12-03T21:11:36Z

📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr22390-5f80cc5
	Commit	`5f80cc5`
	Direct Download	`jetpack-prototype-build-pr22390-5f80cc5.apk`

Note: Google Login is not supported on these builds.

* Add editorialized release notes for 26.4 * Update WordPress `PlayStoreStrings.po` for version 26.4 * Update Jetpack `PlayStoreStrings.po` for version 26.4 --------- Co-authored-by: Tony Li <tony.li@automattic.com>

* Adding a loading spinner to the recommended blogs subscribe button * Fixing the loading wrong state * Fixing it for the post details screen * Fixing blog screen subscription as well * detekt * lint fix * Using suspend function to iterate over cards * Removing the withContext, but keeping the scope usage * Some refactoring * Adding tests * Update WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * Compile fix * chore: trigger CI --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

* Supporting read and discovery deeplinks * Fixing discovery issue * Handling feed links * Handling search and tags * Some improvements * Re-adding deleted code * Lint fixes * Adding tests for ReaderActivityLauncher * Update WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> * chore: trigger CI * Supporting the new Calypso banner specs * Adding some tests --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

* Update editorial release notes * Update WordPress `PlayStoreStrings.po` for version 26.4 * Update Jetpack `PlayStoreStrings.po` for version 26.4 --------- Co-authored-by: Tony Li <tony.li@automattic.com>

crazytonyli · 2025-12-03T21:58:09Z

This PR merges the tag 26.4-rc-3 into the trunk branch. I attempted to resolve the merge conflicts. @adalpari can you please review the changes to see if I resolved the conflicts correctly? Feel free to make additional changes to this PR.

wpmobilebot · 2025-12-04T02:39:50Z

Project manifest changes for WordPress

The following changes in the WordPress's merged AndroidManifest.xml file were detected (build variant: wordpressVanillaRelease):

--- ./build/reports/diff_manifest/WordPress/wordpressVanillaRelease/base_manifest.txt	2025-12-04 02:52:57.385350069 +0000
+++ ./build/reports/diff_manifest/WordPress/wordpressVanillaRelease/head_manifest.txt	2025-12-04 02:53:04.825389416 +0000
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.wordpress.android"
     android:installLocation="auto"
-    android:versionCode="1479"
-    android:versionName="26.4-rc-1" >
+    android:versionCode="1481"
+    android:versionName="26.4-rc-3" >
 
     <uses-sdk
         android:minSdkVersion="26"
@@ -596,6 +596,62 @@
                     android:host="wordpress.com"
                     android:pathPattern="/site-monitoring/.*"
                     android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/discover"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/discover"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/read/feeds/.*"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/read/feeds/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read/search"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read/search"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/reader/search"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/reader/search"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/tag/.*"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/tag/.*"
+                    android:scheme="http" />
             </intent-filter>
         </activity-alias> <!-- Custom Wordpress URI Scheme Deep Linking Activity Alias -->
         <activity-alias
@@ -683,6 +739,16 @@
                     android:scheme="http" >
                 </data>
                 <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="https" >
+                </data>
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="http" >
+                </data>
+                <data
                     android:host="wordpress.com"
                     android:pathPattern="/reader/feeds/.*/posts/.*"
                     android:scheme="https" >

Go to https://buildkite.com/automattic/wordpress-android/builds/24092/canvas?sid=019ae742-319c-4dd3-8924-ca15b4d2b273, click on the Artifacts tab and audit the files.

wpmobilebot · 2025-12-04T02:39:50Z

Project manifest changes for WordPress

The following changes in the WordPress's merged AndroidManifest.xml file were detected (build variant: jetpackVanillaRelease):

--- ./build/reports/diff_manifest/WordPress/jetpackVanillaRelease/base_manifest.txt	2025-12-04 02:52:44.277599865 +0000
+++ ./build/reports/diff_manifest/WordPress/jetpackVanillaRelease/head_manifest.txt	2025-12-04 02:52:51.267610737 +0000
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jetpack.android"
     android:installLocation="auto"
-    android:versionCode="1479"
-    android:versionName="26.4-rc-1" >
+    android:versionCode="1481"
+    android:versionName="26.4-rc-3" >
 
     <uses-sdk
         android:minSdkVersion="26"
@@ -233,6 +233,62 @@
                     android:host="wordpress.com"
                     android:pathPattern="/site-monitoring/.*"
                     android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/discover"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/discover"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/read/feeds/.*"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/read/feeds/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read/search"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/read/search"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/reader/search"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:path="/reader/search"
+                    android:scheme="http" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/tag/.*"
+                    android:scheme="https" />
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/tag/.*"
+                    android:scheme="http" />
             </intent-filter>
         </activity-alias> <!-- Custom Wordpress URI Scheme Deep Linking Activity Alias -->
         <activity-alias
@@ -710,6 +766,16 @@
                     android:scheme="http" >
                 </data>
                 <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="https" >
+                </data>
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/reader/feeds/.*/posts/.*"
+                    android:scheme="http" >
+                </data>
+                <data
                     android:host="wordpress.com"
                     android:pathPattern="/reader/feeds/.*/posts/.*"
                     android:scheme="https" >

Go to https://buildkite.com/automattic/wordpress-android/builds/24092/canvas?sid=019ae742-319c-4b73-a840-d9be17a7ad0a, click on the Artifacts tab and audit the files.

sonarqubecloud · 2025-12-04T02:52:29Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

codecov · 2025-12-04T03:29:58Z

Codecov Report

❌ Patch coverage is 61.53846% with 70 lines in your changes missing coverage. Please review.
✅ Project coverage is 39.11%. Comparing base (9b5ab17) to head (5f80cc5).
⚠️ Report is 4 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...ava/org/wordpress/android/ui/ActivityLauncher.java	0.00%	25 Missing ⚠️
...ss/android/ui/reader/viewmodels/ReaderViewModel.kt	5.55%	16 Missing and 1 partial ⚠️
...android/ui/deeplinks/handlers/ReaderLinkHandler.kt	86.95%	4 Missing and 5 partials ⚠️
...droid/ui/reader/repository/ReaderPostRepository.kt	0.00%	7 Missing ⚠️
...ordpress/android/ui/deeplinks/DeepLinkNavigator.kt	50.00%	4 Missing ⚠️
...roid/ui/reader/discover/ReaderDiscoverViewModel.kt	82.60%	1 Missing and 3 partials ⚠️
...ress/android/ui/reader/views/ReaderFollowButton.kt	0.00%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22390      +/-   ##
==========================================
+ Coverage   39.02%   39.11%   +0.08%     
==========================================
  Files        2203     2203              
  Lines      106348   106493     +145     
  Branches    15061    15118      +57     
==========================================
+ Hits        41501    41650     +149     
+ Misses      61356    61334      -22     
- Partials     3491     3509      +18

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

adalpari

LGTM!

wpmobilebot added the Releases Label related to managing releases label Dec 3, 2025

wpmobilebot added this to the 26.5 milestone Dec 3, 2025

github-advanced-security bot found potential problems Dec 3, 2025

View reviewed changes

wpmobilebot and others added 10 commits December 4, 2025 10:48

Merge release_notes/26.4 into release/26.4 (#22365)

048f9d6

* Add editorialized release notes for 26.4 * Update WordPress `PlayStoreStrings.po` for version 26.4 * Update Jetpack `PlayStoreStrings.po` for version 26.4 --------- Co-authored-by: Tony Li <tony.li@automattic.com>

Merge release_notes/26.4 into release/26.4 (#22387)

b026da3

* Update editorial release notes * Update WordPress `PlayStoreStrings.po` for version 26.4 * Update Jetpack `PlayStoreStrings.po` for version 26.4 --------- Co-authored-by: Tony Li <tony.li@automattic.com>

Update translations

8fd6fa2

Update WordPress metadata translations for 26.4

a3f2921

Update Jetpack metadata translations for 26.4

96b6629

Bump version number

94db763

Update translations

a779362

Bump version number

0d85daa

crazytonyli force-pushed the merge/release-26.4-into-trunk branch from 160ad80 to 0d85daa Compare December 3, 2025 21:58

crazytonyli requested a review from adalpari December 3, 2025 21:58

crazytonyli closed this Dec 3, 2025

crazytonyli reopened this Dec 3, 2025

Fix a resolving conflicts error

5f80cc5

crazytonyli force-pushed the merge/release-26.4-into-trunk branch from 0682739 to 5f80cc5 Compare December 4, 2025 02:47

adalpari approved these changes Dec 4, 2025

View reviewed changes

crazytonyli merged commit 5385671 into trunk Dec 4, 2025
23 checks passed

crazytonyli deleted the merge/release-26.4-into-trunk branch December 4, 2025 21:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Merge release/26.4 into trunk#22390

Merge release/26.4 into trunk#22390
crazytonyli merged 11 commits intotrunkfrom
merge/release-26.4-into-trunk

wpmobilebot commented Dec 3, 2025

Uh oh!

dangermattic commented Dec 3, 2025

Uh oh!

Check notice

wpmobilebot commented Dec 3, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Dec 3, 2025 •

edited

Loading

Uh oh!

crazytonyli commented Dec 3, 2025

Uh oh!

wpmobilebot commented Dec 4, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Dec 4, 2025 •

edited

Loading

Uh oh!

sonarqubecloud bot commented Dec 4, 2025

Uh oh!

codecov bot commented Dec 4, 2025 •

edited

Loading

Uh oh!

adalpari left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

wpmobilebot commented Dec 3, 2025

Uh oh!

dangermattic commented Dec 3, 2025

Uh oh!

Check notice

wpmobilebot commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

crazytonyli commented Dec 3, 2025

Uh oh!

wpmobilebot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project manifest changes for WordPress

Uh oh!

wpmobilebot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project manifest changes for WordPress

Uh oh!

sonarqubecloud bot commented Dec 4, 2025

Quality Gate passed

Uh oh!

codecov bot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wpmobilebot commented Dec 3, 2025 •

edited

Loading

wpmobilebot commented Dec 3, 2025 •

edited

Loading

wpmobilebot commented Dec 4, 2025 •

edited

Loading

wpmobilebot commented Dec 4, 2025 •

edited

Loading

codecov bot commented Dec 4, 2025 •

edited

Loading